e6aebaaec8c1db124568860f2a9e6572cb2e01e4,sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java,SdxL3PeerConnectivityTest,setUpInterfaces,#,234

Before Change


                                       IpPrefix.valueOf(SPEAKER1_IP + PREFIX24));
        Interface intfSw3Eth1 = new Interface(INTERFACE_SW3_ETH1,
                                              SW3_ETH1,
                                              Collections.singleton(ia3),
                                              MacAddress.valueOf(MAC1),
                                              VlanId.NONE);
        configuredInterfaces.put(INTERFACE_SW3_ETH1, intfSw3Eth1);

        // Set up the related expectations
        expect(interfaceService.getInterfacesByIp(IpAddress.valueOf(SPEAKER1_IP)))

After Change


                                              Collections.singletonList(ia3),
                                              MacAddress.valueOf(MAC2),
                                              VlanId.NONE);
        configuredInterfaces.put(INTERFACE_SW3_ETH1, intfSw3Eth1);

        InterfaceIpAddress ia4 =
                new InterfaceIpAddress(IpAddress.valueOf(SPEAKER3_IP),
                                       IpPrefix.valueOf(SPEAKER3_IP + PREFIX24));
        Interface intfSw4Eth1 = new Interface(INTERFACE_SW4_ETH1,
                                              SW4_ETH1,
                                              Collections.singletonList(ia4),
                                              MacAddress.valueOf(MAC3),
                                              VLAN20);
        configuredInterfaces.put(INTERFACE_SW4_ETH1, intfSw4Eth1);

        // Set up the related expectations
        expect(interfaceService.getInterfacesByIp(IpAddress.valueOf(SPEAKER1_IP)))
                .andReturn(Collections.singleton(intfSw1Eth1)).anyTimes();
        // Always return the first matching even if not associated interface
        expect(interfaceService.getMatchingInterface(IpAddress.valueOf(PEER1_IP)))
                .andReturn(intfSw1Eth1).anyTimes();
        expect(interfaceService.getMatchingInterface(IpAddress.valueOf(PEER2_IP)))
                .andReturn(intfSw2Eth1).anyTimes();
        expect(interfaceService.getInterfacesByIp(IpAddress.valueOf(SPEAKER2_IP)))
                .andReturn(Collections.singleton(intfSw3Eth1)).anyTimes();
        expect(interfaceService.getMatchingInterface(IpAddress.valueOf(PEER3_IP)))
                .andReturn(intfSw3Eth1).anyTimes();
        expect(interfaceService.getInterfacesByIp(IpAddress.valueOf(SPEAKER3_IP)))
                .andReturn(Collections.singleton(intfSw4Eth1)).anyTimes();
        expect(interfaceService.getMatchingInterface(IpAddress.valueOf(PEER4_IP)))
                .andReturn(intfSw4Eth1).anyTimes();
        expect(interfaceService.getInterfacesByPort(SW1_ETH1))